Fixed couple of build failures

Not sure I have fixed these in right way. These are conflicts from
Mark's branch. Right now just making application run. Once changes
are pulled into main branch, bug fixing starts.