propagate changes from xcal

@karnem, I wanted to deploy fixes but I found your hotfix not propagated yet in master.

Have you done any other changes which need to be included?