fix up a couple pad and mask dimension issues