Fixed a few things that were lost during battery failure