Pile of chnages for new RMQ versions