Fix some completion issues