Fixes by CH13