Fixed event issues.