minor buildfva cleanup