updated a couple files for build after the rebase