Various little changes.