litle fixes for #5