Fix some minor warnings