Correct issues caused by construction changes from 'master' branch.