A variety of fixes