added fixes for firefly for the new event system