Monthly period bug fixes