Build issue fixes.