Fix interfaces in maps