[misc] Expose a bit more stuff