Correct compiler warnings