Some fixes for port and directories.