Some samples fixed