Fixed minor errors after merge.