Missed cleanups and API fixes