Clear up some warnings