Module merge fixes

includes fixes from merged module repositories