Fixes extension validation
Fixes to substatement validation