Non happy-path fixes
Fix for read dictionary tag
Giving credits where due