Fix storage not mounting sometimes and slow mounting