Fixes 20130506 part2