Bug fixes related to layering transforms