Few bug fixes:13/09/13