More stability fixes