Adding last fixes