Examples fixes and additions