Added fix to handle recent CMAKE build arg prefix changes