Fix Errors for Version 8