Many fixes...