Fixes warnings. Part 2