Fix issues found by lint