Fixing some errors for deployment