More re-ordering to prevent sessions for static objs