Fix obvious minor warnings