Few bug fixes: 20 september 2013