fastMap bug fixes