Clean up some binding issues