Fix string types again