Update to code actually running on Trellis v0.1