Usability fixes for example