Multiple errors during name resolution

@garyb @joneshf  Could you please review? Thanks.