Some fixes after recent updates