Revert "More fixes"

This reverts commit 4b9c243e57c105cd1fe5fc580815adaa06b3959c.