Type tweaks

Like the summary says...