Added some more checks for 'system'.