Fixed some perm issues