Minor 12 fixes