Some changes, abort warnings