Fix build, add some more system introspection.