These should fix the warnings gcc gives.
Merge pull request #3178 from fluffyfreak/fix-spacestationtype-warn

Fix a couple of gcc warnings