Small fixes and examples