Fixes on part18