Fixed some deployment problems