Multiple errors in name resolution

@garyb @joneshf Could you review please?