Fix a couple things that were bugging me