rbmap
rbmap fixes