Fix default types