Improve a few things