Fix compiler/lint warnings