a few tweaks before trying on a remote server