fix map generic type warnings