Fixed completion stuff