Revert "Fixes"

This reverts commit a29f51953272e5dee89babfed67aaabc0aae19a0.