Fixed binding errors