More input tweaks