3 fixes, see also rt