Fixing issues that were apparently not committed? Lol.