Fix the deploying + minor fixes.