Squashing some ickle bugs