fixing issues reported by cgtx