Minor changes to spin