Fix some sonarcloud code smells related to repack expand limit