Got rid of several compiler warnings