Changes up to 30-04-2014

Bug fixes for issues arising in April 2014