20140804 1135 fixes