fixing issues with merge

Here are various fixes for regressions we found in the kiosk after the merge.