Small fixes about supported clients