Fixup some layer issues