Project XSTING: Small Fixes

Small fixes patch