20140804 1620 fixes