Fixed helper files a bit