Fixups and stub code