Linkage

- More build system cleanup and sync betweee 2.4 and 2.3.