Fixing samples - they do not respect XA006 rule