Bug fixes started June 2013