Updated build for #2 and #6