Smaller fixes. Get to the meat!