WIP event handling: Initialization fixes