fix some problems that occured during rebase
fix some problems that occured during rebase

radu-gheorghe/liblognorm,aturetta/liblognorm,aturetta/liblognorm,janmejay/liblognorm,aturetta/liblognorm,radu-gheorghe/liblognorm,janmejay/liblognorm