Minor changes in spwv()