Fixes to completion