13.04 fixes