Added controls against data typed during install