Minor improvement at types conversion