Lint compliance and other minor changes