#21 fixes also applied to OpenLog OSGi plugin