Fixes and fixings