Fix the everything

Signed-off-by: Michael Englehorn <michael@englehorn.com>