Fixes 20130503 part1