Add: this should fix build for library and tools