Fixing some callee issues
Binding refactor/cleanup
csprojs