Add build and build/bootstrap targets