stable fixes