Subject update, and more non-confirmation code-paths