Fixes based on first review pass