3 fixes

Grabs non-controversial parts of #2277, plus fixes resource printing in kubectl not being versioned.