Suggested fixes from @melissa-linkert