Fixing up options for new completion logic