Fixes for PERIODIC COMMIT