Minor change to support non-root installations