Shinken improv

Various shinken support improvements.