fix a few more types; this version seems to work, submitting it