Quick fixes to get running on server again