[BUGFIX] Fix things that are broken without compatiblity6