Finish last fixes