Simplified airline timeout fix and jk->esc