Revert "Fixed a few issues"

This reverts commit bd3da9d5aebf36d8918176d0cfc12045e9d93822.