Bug fixes and singleton investigations