Minor fixes
add SamplePublisher