DRAFT: Fix error events and unbinds