Fixes on part9