More tweaks
Merge the two build systems