Export o few more Compose things, fix a bug.