Minor fixes in CompletionHandler