cleaned up some warnings