All the above fixed (also upstream in kafo).

Give me a go, I can merge.

-- 
Later,

 Lukas "lzap" Zapletal
 irc: lzap #theforeman