Fixed completion issues