More rat fixes