Fixes for <cstring>