Beginning work on Calendar compatibility fixes