Outpostfixes

Created by: Angelite191

Second try due to build issues I just don't know how to fix. Last resort is tearing down the branch and trying again.

#2738