Three fixes