Last fixes before declaring (almost) success