Basemask improvements.