Fix Bridge Errors