some fixes for calendar - @LukasReschke ;)