Minor changes based on Wim's feedback