Fixes on part17