Battery Saver fixes take 2