*/*: small fixies