Fix some errors in last night's commit