Minor changes per Victor.