fixups for various notices, warnings