minor fixes across a few files