Gen Fixes and Event Fixes