Compilation warning clean up