Some touch-ups and API migration