Various bits and pieces for KSP