Input fixes again