(Apple) Input cleanups