Changed a few types.