Actually fix Companions. Need skill fixes.