fixes from working in PLT and after