Some more fixes for examples