Fix coffre / cleanup