Added unused clafer quick-fix, and xor fix
Added unused clafer quick-fix, and xor fix