Dev internal

Use a different port for nginx restart checking, plus other minor fixes.