Minor input improvements