SWITCHYARD-2457 and SWITCHYARD-2440 - Fixes for delayed validation