fixes for several dictionary lookups