#1424 target upgrade fixes