Bootlint fixes