Misc changes to make pub happy.