Change some more permission nodes, some buildfile tweaks