Logging made configurable
Package build fix