Fixing more stuff for deployment