Fix some binding idiosyncrasies