mainly fixing compiler warnings