Minor corrections for new layer formats