* Fix dictionary access
* Remove redundant Log calls