More interaction tweaks