Change AID and some small fixes.