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