Fixed hopefully insert/delete template compilation