Fixes 20130410 part2