Fixed up some compilation issues.