Fix inputs handling issues.