Updated code to make functional builds.