Small additions for bnc#808377