Fixing build errors.