Fixes for post user-defined valition function run