Fix completion problems