Binding/Syntax Fixes