Fixes for P2 in interactive maps