Fixes to completor