Fixed several bugs in Bateau constructions