Name fixing, etc.