Spin - small fixes