Some type fix