Layering fixes