fixing more stuff broken by the merge