Compiler warning cleanup