Msgpoll fixes