fixes to try to make make happen