Various small fixes to make deployment work