Small tweaks

Just some cleanup on small integration details.