A few final minor changes