Fixes

Corrected pull against fixes.

Fixes for binding errors.