Made some fixes in the code base while testing getting and synching to
GitHub repository.