Fixed dict() calls