Fixes 20130503 part2