Layered framework fixes