Fadry: Various fixes

Hello! This is another one of them bug fixes. It was originally meant to release along with some other stuff, including the upcoming expansion, but I separated it and released it now. Fixed an issue that caused the chea…