Fix rest of errors, some CCE crashes and one NPE