Minor fixes for my wonder mappings