fixing issues reported by landscape.io