Fixed compile issues.

Caused by some stuff left over from diff file?