Minor permission and style fixes