Changes for latest mbelib