Small corrections, because alasc and core refactorings.