last fixes

last fixes