Updated handling of Internal builds