fix problems reported by diego nieto