Fixed remaining warnings