Minor XPS modifications