More cleanups and some wrapper helpers