some stability fixes