Squelch warnings and minor cleanup