Fixes to the layers