Fixes to Eliminate blind imports rule