Fix MER#814 and more