Sample fixes