Fix some bugs in lumberjack