more type tweaks