Trivial changes. Now compiles with 0 warnings, yay!