Fixing some compile issues.