Final fixes in develop branch.