Fixes from NextFaze 

General fixes that were med in other projects, incorporating back into ManUp.