More feedback tweaks