Part 2, last fixes