Fixes for new compound-passport module.