Fixed protocol issues