Fixed various working period issues