Merge "Added fixing of log.h errors"