Add a few other improvements