Tweaks to support Habanero PNOR Layout