Fix small things

Does this require a migration update?