A few final changes