further integer tweaks