Register binding bug fixes