Some example fixes related to #1