Top level fixes, IF wired