Tweaks to server to load properly