Various broot fixes