Duplicate code checker fixes