Small changes to the layer manager