Minor fixes to spinner