Added missing deps and fixed ExceptionUtil to match others