Fix code that I broke when merging with master