Fixed issues with latest changes. Builds and runs successfully.