Fixes to make it work on servers

My bad