[WIP] Fix BlockEvent issues, fixes #271