Improved/fixed spinners