bug fixes after Vicente's intervention at Soleil