minor cosmetics
Fix master first run when not in standalaone mode