Be lenient towards Main / don't require ooc (also more logical). Closes #606