Fixing some deploy issues