Fixe Bugs that are for 8.0.0

Please see commit for information.