More type updates