binding fixes