Fixing references to static Calendar obj