Port of E bug fixes to moksha