Taking care of some of the compiler warnings