Multiple stability fixes