13.03 last fixes