misc changes to inccheck