Fixes from show'n'tell