fixed some completion issues