... change a few types ...