Fix a couple issues I noticed in commit a5b71fcecf3fb512307c33c323c97195d2fe0930