Fix import

This pull request fixes calendar imports.
Part of it was already fixed in #452, this fixes the remaining occurrences.