Shortened sample references and fixed the last actual fix