Fix some errors introduced by my last commit