Made more things safer for repos without categories