Increased stores, fixed compatibility for them