cleanup compiler warnings etc.