Fixing here and there on CustomSample