fixes for %period support