Rtype fixes