[18] Fix some race conditions during terminal load