Battery fixes