Various input tweaks