12.04 fixes

Signed-off-by: Jochen Maes <jochen@sejo-it.be>