System/Proc mapping on import fixes