Minor fixes around PERIODIC COMMIT