Fix local -> remote url problems