Fixed the problems reported by fabbot