Got rid of various compile warnings