Fixes to calendar.js arguments