some 12.04.5 fixes