Various fixes.
Fix deploy