Last corrections to dev server