Fixed up some warnings