Various deployment fixes.