Many fixes II