Some minor cleanups to the codebase.

I noticed these few problems within the codebase and rectified them.