Hotfix

Fixed a few bugs