Tweaks / fixes for compose view.