Moar Faction Fixes