Fixes in maintenance schedule