Further nitpicking