Stability fixes and reorder