further mask confusion fixes