Fixes on Spinner