Fix completion errors again