Trinity fixes