Baku incident still wrangles with Perez, as he looks to make amends in Austria