Fix merge mistakes from previous commit