layering fixes