Fixing the compiler warnings