Some other improvements