Add forgotten changes from previous commit