Fixed calls to Calendar/Event Builders