Fixup compiler errors, missing #include <cstring>