fixing stuff for the samples