A few small patches