Fixes to get deployment working