Correct over zealous metabox nonce checking
Fix some bugs introduced during refactor