Syntax fixes
Temporarily removed pcalls