[CLEANUP] - minor bug fixes in map and broadcast samples (legacy version 4.x)