Syntax check fixes