Make a few improvements