Some minor tweaks before we start with validation.