Protocol X: Bugs fixed

Small bugs fixed