Minor changes
Manually merged and tested changes from reconstruction4perception branch