Fixes 20130504 part2