Last few fixes I found.