Fixed a few files

Apparently there were a couple of files that never got converted properly, got I decided to change them over myself.  Seems to resolve every red flag that shows up in the IDE.