Fix issues introduced in 47c50a