Some fixes that didnt get pushed