Battery related changes