Fix up subject a bit