Various corrections to make the cascade of faction -> class -> advanced
class work properly.