Fixes after revert