Quick fix for rho keyword in core. Put in TODO for needed fixes spotted.