Added more example fixes