fix a few binding issues