Schedule saving and rendering fixes