Bugfixing for issues raised on May 1st 2014