Fixes 20130501 part2