Fixing path issues for server