Fixes in tensormaps