Bug fixes, example consistency