Some changes to accomodate for arithmetic exceptions