Minor Build Fix V2