more fixes that didnt get pushed