More fixes

Add server.port and ensure all the matching strings are replaced.
Add server.port