Event sys fixes