Review fixer-upper fixes, both small but worthwhile, thanks!