Minor stability fixes