Various bugfixes to spatial and concept mapping.