various 30c3 fixes