Fixes on part20