Fixed messages in sample