fix to samples and build fix