Some more interaction tweaks