Last changes before FOSDEM

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>