0.4 Dict syntax change: prevent errors. Still need to fix warnings.