event and calendar fixes