Minor changes req. by in-house (non-OSS) wb-el