Worked through the build again, some tweaks.
Merge commit 'a8d80708aeef845a50d9b96ce541143c62e2e574'