Minor bugfixes part troix