Random Fixes

Doesn't this belong to the other pull request?