Protocol X: Fixing Bugs

Fixing small bugs