Morning fixes with rory