Some function type updates