Fixes specified by scranfill in PR discussion