Fix paths and check roles as well