calendar directive fixes