more compose tweaks