449 last fixes