align last modifications
fix compile scheme