Finally someone who knows this contacted me. The waltz is In einen Kleinen Cafe in Hernals. You can find sung versions on youtube. Keep in mind the song has an introduction before the recognizable melody starts.
I still don't know the name of the other one, but I have recordings of both if anyone would like them.