Tweaks from code review