Fixed weird little brokennesses which I hadn't been paying attention to.