Fix permission management