Revert "Fixes"

This reverts commit 38e057f10eb1df305f63e5b598173177a9419549.