A few improvements