Fiddly fixes