SPIN experiment - fixes