More sample fixes