Fix pilot bugs