Proposed Fixes for Layering!

Anything to add to the list?