Other small changes for the layer...