Adding more quotes to solution and dirs.