Fix issues with deployment