follow up fixes for initial mask functionality