Boolean to boolean, other changes