Fixes on principal config