Fix standalone input functions