Fixing final oti base URLs