Fix some errors after previous merging