Hotfixes, revert some changes