Fix Ostack and Pstack