Review tweaks from @jabley