additional fixes to get build passing