Fix Bootstrap errors

Fix Bootstrap errors reported by Bootlint.