Small bugfix and permissions