Revert "Fixes"

This reverts commit 5feba0296b79190f75bd95adf3849fd0e71a647f.