Fix short runway problem and simplify loading indicator logic