Style and perm fixes