Zap some newer compiler warnings