Some fixes i missed