Bug fixes: 23 september 2013