Fix more paths, for removal of the client directory