Fix Perimeter Profile bugs
clean-up/fix