Minor changes for show and tell