Support for name resolution + bug fixes.