140804 issue fixes 1