Minor fixes in BDTShape and plotting macros