fix -Werror build, point to modified branches with warnings fixed

fixes to be pushed upstream