Minor changes caused by the previous commit