Lumberjack bug fixes