Compiler warnings removed