Fixes for validation