Fix two more remaining warnings