Less-important code fixes