Dictionary fix and production parameters