Fixes based on code review today