Fix some warnings.
Merge pull request #41 from GalacticMegacorp/develop

Fix some warnings.