The latest and more or less last fixes