Fixes on part8