Final tweaks before deploy