More fiddly fixes