Bug fixes, sample configurations