Mostly bugfixes Oct2013