Revert "Fixes"

This reverts commit 5dc51c7d7283b42ed096481e3dc95925375a3df2.