With regards to the J17 tender, this should have a rectangular coal space and not a sloped self trimming type. Only B12 and B17 Sandringham's had self trimming versions of the large Holden tender. You can find more detail from Llyn Brookes article in GERS Journal 92.