make fixes to get working again