A few tweaks before the testing release