Clean up persona integration a bit