Fixes after recent changes