Build issue fixing