Latest small fixes + spinners