Fixed some protocol stuff