Various small fixes to ensure that the app update works