Fixes for @gvwilson comments