Fix two warnings that show up recently

(for the 1.x branch)