More fixes to get it working. This is exhausting.