Compiler warnings fixed