mbpoll fixes