Fixed some compilation and naming issues.