Jury-rigging for first build

Some files modified to allow a first build (refer to the diff for
details).