Fix a few lines accidentally deleted by last commit