Fixes more autoarg errors