Fix buildfix: there shouldn't be a zero there at all.
Remove unnecessary ifdef
Fix disarm warnings in clang more properly