Took care of some warnings