Fixes to layer elements