Minor fixes
If default is 0, skip XOR for non-float types
Update TODO