Fixes for new K2 Maps plugin