Fixes to spinner