More input santization