Update all permissions to use a static reference and other misc. things