Revert "Fixes"

This reverts commit 4e41db84c275648b0ddf0e442434778fc2dded46.