More Beast Master changes