Fixes in mabuser