Additional binding fixes