Minor changes from Pavel