Fix issue reported by bootlint