Couple of completion/resolution things got handled