Changed perms + other cleanup