More fixes for trigonal