More fixes

I should have used the 'revert' feature. Will use next time.