Fixed errors reported by gitreview