Fixed some warnings.

Apparently, Map is still not supported.