Improve dependency loader and fix missing paren