add
fixes to avoid template compilation errors