Trinity Fixes