Tweaking some completion block related items.