Fix mitm and do some RE for static entities