Fixed some minor build breaking issues.