Bug fixes from observation sheet