Fixes that Rob suggested