Resolve code checker issues