Fixed up several things about the sample type