Fixes for spinner