Misc Changes to make it work with my server