Fixed remaining calls to get_mask