Fixed issues with draw saver