Check for cursor connection consistently
Alignment WS
Missed two comments