Fix bugs after testing on one server