Remaining days fixes