Minor input tweaks