Extra fixes

Some of these might not meet your approval, merge as you see fit.