Some minor fixes to pass the capp_lint checks