RT fixes, etc.