Fixes after permissions merge