Compiler warnings fixes