Fixed misc completion errors
Fixed completion errors