Fix small, fiddly problems.