LOTS of fixes after a rollback