general gubbins fixes