Fastmap bug fixes