A bit more fixup