Fixes for examples