A few fixes to get running on the server