Fixed 2 more minor warnings