Fixes to master startup and usage