more fixes in mapping