Few bug fixes:16 september 2013