Quick tweaks from review stage