last fixes before routing